(mail-yank-original): Set buffer-file-coding-system from the one used

by the message whose text is yanked.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index b392ddcfac7c805429d1880487134242160fde0b..09028a37628fa54305c2ba205add6f6b9687f508 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1506,7 +1506,19 @@ and don't delete any header fields."
          (delete-windows-on original t)
          (with-no-warnings
            ;; We really want this to set mark.
-           (insert-buffer original))
+           (insert-buffer original)
+           ;; If they yank the original text, the encoding of the
+           ;; original message is a better default than
+           ;; default-buffer-file-coding-system.
+           (and (coding-system-equal
+                 (default-value 'buffer-file-coding-system)
+                 buffer-file-coding-system)
+                (setq buffer-file-coding-system
+                      (coding-system-change-text-conversion
+                       buffer-file-coding-system
+                       (coding-system-base
+                        (with-current-buffer original
+                          buffer-file-coding-system))))))
          (set-text-properties (point) (mark t) nil))
        (if (consp arg)
            nil